Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:46:13 +0000 (23:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Apr 2012 06:46:13 +0000 (23:46 -0700)
commit672d8712206d634ab50646f61fb5168a7da9a756
tree7b40796d7cf89d0dbdb14e6c7999393ae2430b3b
parent06cdf272580d89a7cfe3692dbc2ac64d3bfb7e33
parent2502b4377707d247dd26df504fe87b1997014193
Merge from trunk.